Hi @sastcsgh, thanks for the PR, much appreciated! Im so sorry, we just merged a PR that touches on how you interact with the commands-queue. Those changes are in a bit of a conflict with your changes. It would be great if you fix the conflicts, then I can review more thoroughly.

Just to give you some hints:
The new way we hook to push events on the commands-queue is via addPushHandler, also take a look at the PushHandler definition. Keep in mind that currently, client-side caching is fully consuming the invalidate push message by returning true ( maybe you can make it return false, then return true from your new handler )

No worries @nkaradzhov, the new pushHandler logic looks much more robust than the old solution anyway.
I re-wrote the logic for emitInvalidate in the new push handler style. (Like before, it's basically the same logic as for the cache, except it emits the invalidate event instead of calling the invalidate method of the clientSideCache).
I left the push handler for the cache as it was, since the cache itself emits the invalidate event anyway, so when the cache is used, we can listen for the event there.

@sastcsgh So sorry, i tried to fix the merge conflicts via the web interface, but actually made things worse... Can you please remove my last commit from your branch and fix the merge conflicts so we can run the tests again

As far as I can tell, the only remaining issue was the changed maintenanceHandshakeCmd logic. Should be fixed now!

@sastcsgh thank you, this looks good to go. Just want to have @bobymicroby give one final blessing